Merge "Fix time zone settings restriction logic" into main