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

* commit '3d3621f08b02ae559036c7d085c02276ae0a24d9':
  Fix issue 3412777 ANR on adding effects.