Merge "Fix crash due to null uri in ContentObserver.onChange" into nyc-dev