Merge "Dismiss TV PiP notification right after exiting" into main