Merge "Change layout of ToggleAction for GlobalActionsDialog" am: edabed7f am: 8c69f7b3 am: ba0bac5e Change-Id: I2dea44a3ed9f266b3dc1605747d44d9a7b370ec7