Merge "Allow restricting the scope of a phone-filter search" into jb-dev