Merge "Fix launcher holds a surfaceController" into main