Merge changes Iad270dfd,Ice608e6d,I375369a8

* changes:
  Adding initial TRON logging for picture-in-picture.
  Disallow entering PiP when activity is locked.
  Preventing cases where an app can be stopped while entering PiP.