Merge "Add a state to LocationTimeZoneProviderController"