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

* commit '712a8cca1f9e438af224f93c3a4644853331af2e':
  VolumePreference.onActivityStop only stops playback