Merge "msm: pm-8x60: Do not default to WFI when not enabled"