am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb

* commit '54b0a7f3ff0411a215e7e23f1041d414a32147b5':
  Fix issue 3412777 ANR on adding effects.