Merge "Use device config to control hints allow list for fill dialog" into tm-dev