Merge "Create flag for a Desktop Windowing SurfaceControlViewHost cache" into main