Merge "Fix ACTION_VOLUME_CHANGED behavior" into tm-qpr-dev