Merge "Consume MOVE from different devices one at a time" into main