Merge "EffectBundle: Make effect draining more robust" into qt-r1-dev