Merge commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11' * commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11': Do not grow the viewport width to infinite to fit
Merge commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11' * commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11': Do not grow the viewport width to infinite to fit