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