Merge changes Iabb33606,I3c364ebe

* changes:
  Falling back to media session controls.
  Move activity to fullscreen stack when it is relaunched in PIP.