Merge "Cancel pending selection before filtering input" into nyc-mr1-dev