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