Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev