Merge "Revert "CTS for scrollbar dimensions"" into oc-dev