Merge "defconfig: msm8974: Enable secure touch"