Merge "Add goToSleep that supports non-default display group"