Merge "Listen for policy change that affect time/tz" into main