Merge "defconfig: msm8974: Enable CONFIG_THERMAL_QPNP"