Merge "Status bar icon ordering" into pi-dev
am: c1adfac496

Change-Id: Id72779dc5e54b9175cacdf0c6fe0342afcb3ffbe