Merge "Only move PIP window if PIP is not way above shelf/IME." into pi-dev