Merge "Fix iterator double-advance in ContentObserverController" into nyc-dev