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

Change-Id: Iba59fc196d462f51160f77f85f55c20d45a8d75a