Merge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev
am: a8464603ed

Change-Id: I546936b695ae0355a92aa3dd6131e369f784b98e