Merge "hwc: Handle DOZE_SUSPEND properly"