Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb