Merge commit 'a4fa107f97933a81c42ee3cd9ca3984c08e5ab25' into eclair-mr2-plus-aosp * commit 'a4fa107f97933a81c42ee3cd9ca3984c08e5ab25': Do not grow the viewport width to infinite to fit
Merge commit 'a4fa107f97933a81c42ee3cd9ca3984c08e5ab25' into eclair-mr2-plus-aosp * commit 'a4fa107f97933a81c42ee3cd9ca3984c08e5ab25': Do not grow the viewport width to infinite to fit