Merge "defconfig: msm8226: enable deferred resume"