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

Change-Id: Ida61a4c571b022951bd15f07123de60b3c54c2e8