Merge "Improve the cache rebuild latency of AppsFilter on boot #3"