Merge "libgui: Add null pointer check in setDisplaySurface" into nyc-mr1-dev