Merge "Update local state value when the state value changes" into main