Merge "Rename defaultToObserveMode to shouldDefaultToObserveMode" into main