Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev am: 0964a2d9fc
am: 2679fe4e95

Change-Id: Ia664d87748f1febf544a5def60802456951dc23e