Merge "Fix renaming in device filter" into tm-dev