Merge "[bc25] Remove SceneFamilies.NotifShade and associated resolver code." into main