am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"

* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
  VolumePreference.onActivityStop only stops playback