Merge "Work around the flicker on enter PiP for foldables" into main