Merge "Set _modifier=_MODIFIER_MEDIA_SCAN for existing db rows" into mainline-prod