Merge "Refactor DynamicIndexableContentMonitor"