Merge "Migrate PARENT column from legacy MediaProvider's database" into mainline-prod