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

* commit '05a797faf9d177ebb1d9b346eccc70af1c1c7861':