h: fix double suspend/resume issue

Change-Id: If393f0e2b57f3c55025dd029c86cb6a0bf24d4a7
Merge branch 'cm-11.0' into martincz