Merge "Change hour and minute alignment in text TimePicker" into main