Merge "Enable hibernation by default" into sc-dev