Merge "Global actions visuals - color and ordering changes." into pi-dev
am: 4a28bbaf8f

Change-Id: Iaec9b64d1807c0ee692d5de1b4b51328b391343a