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

Change-Id: Iadd8f83066f1c68da7884e0821921a85077b2116