Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev am: 5a0c1e1101
am: 471cf1b910

Change-Id: I57fc05f3e8b582b11ae90b26395b10365624239a