Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2