Merge branch 'topic/hda-resume-fix' into topic/hda