Merge "Speed up the cache building of app info data" into rvc-dev