Merge "Fallback to clear disable_gesture_pip_animating" into main