Merge "Deduping multiple prediction UI update calls" into sc-dev