Merge "Always use new controls layout for GlobalActions." into rvc-dev am: 1f20930de8

Change-Id: I20fd147c6ada0097f4b7faf80bafa0bd52e48de9