Merge "Snap to the edge when expanding the PiP window" into rvc-dev am:...
Merge "Snap to the edge when expanding the PiP window" into rvc-dev am: 4e0f10c1 am: 1b4515c0 am: 0de56d38 am: 52c75894 am: 1d213be0
Change-Id: Iac00eeeadfcef94c9763b141f8a729064517a1cd