Merge "Add owners for controls" into tm-qpr-dev