Merge "Fix broken hibernation test" into sc-dev