Merge "Revert "Fix stale View tracking in ShadeViewDiffer"" into tm-dev