Merge "Make defaultToObserveMode public" into main