Merge "Fix issue 3412777 ANR on adding effects." into honeycomb