Merge commit '4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4' * commit '4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4': fix window layout problem in ViewRoot
Merge commit '4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4' * commit '4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4': fix window layout problem in ViewRoot