Merge "defer resume while selecting text"