Merge "Move trigger for dialog to change controls settings" into tm-qpr-dev