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