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