Merge "Add tests for new content observer API with change Uri."