Merge "Change alarm/ringer status QS separator." into pi-dev