Merge "Ensure that PiP mode changed callback if animation is interrupted" into...
Merge "Ensure that PiP mode changed callback if animation is interrupted" into oc-mr1-dev am: 82910bdf
am: ec51999f
Change-Id: Iffd9dbe073da1a78300d907bac4fd55cc70e6b64