Merge changes I3ef361bd,I89a5184c

* changes:
  Refactor PiP logic in preparation for expanded state.
  Modifying RemoteAction callback to PendingIntent.