Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev