Merge "Factor in userId for updateHotseatItemsFromRunningTasks" into main