Merge "[AppsFilter] fix cache lock and rebuild cache if needed" into tm-dev