Merge "Fix Autofill dialog does not work" into tm-dev