Merge "[AllApps] Fix ConcurrentModificationException in AppPredictionRow" into sc-v2-dev