Merge "Implementing support for item diffing instead of creating out the complete UI on every update" into tm-dev