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

Change-Id: I75906bf23cf7f6fcc1d48a106a5926714e1103dc