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

* commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517':
  VolumePreference.onActivityStop only stops playback