Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0