Merge "Add repository for controls related settings" into tm-qpr-dev