Merge "Change layout of ToggleAction for GlobalActionsDialog"