Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev