Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into mnc-dev