Merge "Remove owerUid from WindowSurfaceController constructor"