Merge "Selectively delay ContentObservers based on state."