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

Change-Id: I9b8d45c33bf3e83e7c25f5bafc2f7d90be9d875c