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

Change-Id: Ib96a8c9588777a428b68c13915febaedf05787d9