Pushed on behalf of Shuo, changed cancel button in SearchActivity.  Cancelling is now much faster