Merge "SurfaceFlinger: Fix null pointer exception"