Merge "Don't resize WindowStates without a Surface." into jb-dev