Merge "Make pixel shifting of custom clocks consistent with default"