Merge "Refactor Date & Time Settings" into main