Merge "Always use new controls layout for GlobalActions." into rvc-dev am: 1f20930d am: c590fbc6 Change-Id: I53c8c37ac87d4b7bf424680ae7b8494200ac0871