(maybe) Fix chrome scroll bars bug on ipad and galaxy tab
Merge