Merge "PiP: Re-attach PiP menu when display changes." into tm-dev