Merge "Remove explicit calls to onFilterComplete" into honeycomb