Merge "Revert "Add maxlength of 6 for time correction in preferences""