Merge "[Catalyst] Add KeyedObservableDelegate and fix datastore binding issue" into main