Merge changes I301a7f78,Id9dbd4e5

* changes:
  Improve the cache rebuild latency of AppsFilter on boot #2
  Improve the cache rebuild latency of AppsFilter on boot