orientation change fix for android.
Merge branch 'hotfix/2.9.1'