Merge "Fine tune Select time zone Settings UI" into tm-dev