am e4e3d9c4: (-s ours) am 27f72f5f: DO NOT MERGE: from master -- Don\'t restart when screen size changes.

* commit 'e4e3d9c4b74a73fa5962c65ea5ca5c580ed53fd7':
  DO NOT MERGE: from master -- Don't restart when screen size changes.