Merge "Revert "Switch clock face while docked.""