Merge "Added removed null checks around calls to WindowSurfaceController"