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