am bf40d923: am 306b9805: 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 'bf40d9235c05d474f942144c68382d521050f371':