Merge "Ensure that PiP mode changed callback if animation is interrupted" into oc-mr1-dev
am: 82910bdf16

Change-Id: I15ad3c03c2c9d11550e1ea5a762e3f368e6e8299