Merge "Do not inset scrollBounds by padding unless clipToPadding==true" into sc-dev