Merge "Reset display input properties when removed" into tm-dev