am 5194aa56: am a8c48521: Merge "Volume keys control music volume after music...
am 5194aa56: am a8c48521: Merge "Volume keys control music volume after music stops" into jb-mr1-dev
* commit '5194aa56':
Volume keys control music volume after music stops