Merge "Allow TRANSIT_TO_FRONT to enter PiP if needed" into main