Merge "Damage IsolatedZVolume when shadows change"