Merge "Fixed issue with stack size when rotating screen."