Merge "Don't purge effects we're about to start using" into jb-mr2-dev