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: 36583a36 am: d9aa6b6a
Change-Id: I2812754056b5b09073004845f02a1d5b4fb46db2