Merge "defconfig: msm8974: Enable Logitech XPAD driver"