am 648dc03c: am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"

* commit '648dc03cd038a726b25929f9ffc142eb16e891e8':
  VolumePreference.onActivityStop only stops playback