Merge "effects: fix a theoretical memory leak" am: 7f4beda2de am: 139b5728e2

Change-Id: Idac6217b6be23b138dda448f470443de28326189