Merge "Make fill dialog feature controlled by device config" into tm-dev