am 780dbd33: am 0d24eb5e: Merge "Don\'t purge effects we\'re about to start using" into jb-mr2-dev

* commit '780dbd3357511770d655e55f69036d63c90089a9':
  Don't purge effects we're about to start using