Merge "libgui: Add null pointer check in setDisplaySurface" into nyc-mr1-dev am: 669867835b am: 1d3d791b3c
am: 8428562653

Change-Id: I00f8e41bed5dd0ffd292cff7d99b4262a5b0db02