[DF-2339] - "deferred expanding" logic is changed to handle changes on the scene too.