Merge \"PiP animation: Move window with resize when ending animation.\" into nyc-dev
am: 4624d687f7

Change-Id: I94fc4de5fd24f75b2b69f6380048d8e57ae7980e