Merge "Always use new controls layout for GlobalActions." into rvc-dev am:...
Merge "Always use new controls layout for GlobalActions." into rvc-dev am: 1f20930d am: 897976b5 am: d79f49fe am: c88e30f0
Change-Id: I280734aeca9294c4a877210bf692f453d30efa99