Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev