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

Change-Id: If2e5e89990859ea583c696a9cd8eaeaee816e45c