Merge "Renames customization content provider (4/7)." into tm-qpr-dev