Merge "Reset Autofill dialog if the content is changed" into tm-qpr-dev