am ed60ba1e: Merge "Add a better app filtering mechanism and filter widgets" into jb-ub-now-indigo-rose

* commit 'ed60ba1e24512bef0bb2b749b6297e8c7e5330cf':
  Add a better app filtering mechanism and filter widgets