Merge "Fix janky auto-enter PiP animation from split activity" into main