Merge "Add WakeupController and NFLogListener"