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

Change-Id: I4d7fcdde58123cf7e5d88398b0d5fe30a46ffd1e