Merge "Make volume rocker change ringer volume instead of alarm" into ub-deskclock-escargatoire