Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev