Merge "Revert "PM#goToSleep and PM#wakeUp only affects default display group""