Minimize changes diff between our branch and ging/master in Screen.js

To avoid future merge conflicts