Merge commit '33992d4195fe55f42ba6919f5a07707a51a12d5d' * commit '33992d4195fe55f42ba6919f5a07707a51a12d5d': Fix some input device mapping bugs with certain drivers.
Merge commit '33992d4195fe55f42ba6919f5a07707a51a12d5d' * commit '33992d4195fe55f42ba6919f5a07707a51a12d5d': Fix some input device mapping bugs with certain drivers.