Merge "Cancel pending selection before filtering input" into nyc-mr1-dev am: a4e2b2a1c1
am: 9185bff25b

Change-Id: Idf4a89b350d1f67fad697312df761a24e1832106