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

Change-Id: I8d09d29d5515f802bafa23775391e4f524e4c210
1 file changed