Merge "Exit hibernation when usage is detected" into sc-dev