Update the patch to fix the calendar bug and minor issue when timezone isn't selected.

#57301506