FLUID-4966, FLUID-4970: Added the fix for the horizontal scrolling.
Merge remote-tracking branch 'jon/FLUID-4970' into FLUID-4970