Merge branch 'master' into wl-electron-37

# Conflicts:
#	package.json

src/atom-environment.coffee

@@ -234,13 +234,14 @@ class AtomEnvironment extends Model
     checkPortableHomeWritable()
 
   attachSaveStateListeners: ->
-    saveState = => @saveState({isUnloading: false}) unless @unloaded
-    debouncedSaveState = _.debounce(saveState, @saveStateDebounceInterval)
-    @document.addEventListener('mousedown', debouncedSaveState, true)
-    @document.addEventListener('keydown', debouncedSaveState, true)
+    saveState = _.debounce((=>
+      window.requestIdleCallback => @saveState({isUnloading: false}) unless @unloaded
+    ), @saveStateDebounceInterval)
+    @document.addEventListener('mousedown', saveState, true)
+    @document.addEventListener('keydown', saveState, true)
     @disposables.add new Disposable =>
-      @document.removeEventListener('mousedown', debouncedSaveState, true)
-      @document.removeEventListener('keydown', debouncedSaveState, true)
+      @document.removeEventListener('mousedown', saveState, true)
+      @document.removeEventListener('keydown', saveState, true)
 
   setConfigSchema: ->
     @config.setSchema null, {type: 'object', properties: _.clone(require('./config-schema'))}
@@ -655,6 +656,7 @@ class AtomEnvironment extends Model
 
   # Call this method when establishing a real application window.
   startEditorWindow: ->
+    @unloaded = false
     @loadState().then (state) =>
       @windowDimensions = state?.windowDimensions
       @displayWindow().then =>
@@ -842,16 +844,15 @@ class AtomEnvironment extends Model
     return Promise.resolve() unless @enablePersistence
 
     new Promise (resolve, reject) =>
-      window.requestIdleCallback =>
-        return if not @project
+      return if not @project
 
-        state = @serialize(options)
-        savePromise =
-          if storageKey = @getStateKey(@project?.getPaths())
-            @stateStore.save(storageKey, state)
-          else
-            @applicationDelegate.setTemporaryWindowState(state)
-        savePromise.catch(reject).then(resolve)
+      state = @serialize(options)
+      savePromise =
+        if storageKey = @getStateKey(@project?.getPaths())
+          @stateStore.save(storageKey, state)
+        else
+          @applicationDelegate.setTemporaryWindowState(state)
+      savePromise.catch(reject).then(resolve)
 
   loadState: ->
     if @enablePersistence

src/module-cache.coffee

@@ -202,13 +202,13 @@ registerBuiltins = (devMode) ->
 
   atomShellRoot = path.join(process.resourcesPath, 'atom.asar')
 
-  commonRoot = path.join(atomShellRoot, 'common', 'api', 'lib')
-  commonBuiltins = ['callbacks-registry', 'clipboard', 'crash-reporter', 'screen', 'shell']
+  commonRoot = path.join(atomShellRoot, 'common', 'api')
+  commonBuiltins = ['callbacks-registry', 'clipboard', 'crash-reporter', 'shell']
   for builtin in commonBuiltins
     cache.builtins[builtin] = path.join(commonRoot, "#{builtin}.js")
 
-  rendererRoot = path.join(atomShellRoot, 'renderer', 'api', 'lib')
-  rendererBuiltins = ['ipc-renderer', 'remote']
+  rendererRoot = path.join(atomShellRoot, 'renderer', 'api')
+  rendererBuiltins = ['ipc-renderer', 'remote', 'screen']
   for builtin in rendererBuiltins
     cache.builtins[builtin] = path.join(rendererRoot, "#{builtin}.js")