Merge "Hide PiP menu upon display change" into main