Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev