[D11] much more slim-lined version of 42076, in order to avoid pulling in new assets, and even to avoid prefab changes beside the shadowing fix (this has been done with a script rather than a plastic merge, which can only work on changelists, not files, let alone partial files)