Merge "Don't re-enable observe mode prematurely on preferrred service change if we've scheduled a runnable to do it." into main