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

Change-Id: I800980c3c887dd722410b427b7912b254012effc