Merge branch 'hid-suspend' into picolcd