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

Change-Id: I9ce3e5fd479e9e3fe9b7a233b75fa7c7a3b01ae8