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

Change-Id: I2dea44a3ed9f266b3dc1605747d44d9a7b370ec7