Merge "Remove source selector from SearchDialog"