Merge "msm: pm: Adjust for events with hard wakeups"