Merge "Add flag for multi-device input" into main