Merge "Always use new controls layout for GlobalActions." into rvc-dev