Merge "Rollback dropdown or inline suggestions when cancel fill dialog" into tm-dev