Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev am: 11139e913c
am: 7e60dac6cb

Change-Id: I599f62dbb9c17e3cdb79ea2363d6e162260793da