Merge "Clean up content observer code."