Merge "Move the alarm status icon to the first position." into pi-dev
am: 297a3e27e1

Change-Id: I37ef72d97779cddca810f738807ce255792fa454