Merge "PiP: Move menu to SystemWindow."