Merge "Handle null uris in content changed events." into nyc-dev