Merge "Fix shouldDefaultToObserveMode attribute to work for Off-host services" into main