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

Change-Id: Ied5fb499ab92bf1b88717156ee88ee20c909d271