Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev