Improve the resize process when the device orientation is changed.
Merge branch 'issue7_test' into dev