Merge "Fixes for ending PiP animation." into nyc-dev
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: I58d62d0d0dd964264395b545bf4e3093a0ffaf88