Merge "Change layout of ToggleAction for GlobalActionsDialog"
am: edabed7fb7

Change-Id: I69c3c616673acef02e3b8dfdce4e10944704e8b6