Merge "Change the thread of onSelectionTerminated"