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

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