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