Merge "AppWindowToken: Guard against null SurfaceControl in prepareSurfaces"