Merge "Remove unused unfilteredListeners and smartspaceViews." into main