Merge "VolumePreference.onActivityStop only stops playback"