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: c590fbc6 am: 1ab8fae2 am: cab9bb1d
Change-Id: Icaa419b83045f6889d639f17eafd72341c8e4383