Use SCROLLBARS_INSIDE_OVERLAY to reduce excess width of sidebar

Change-Id: I07df99f67ee8ad0443e7e471a6f3c7c2f34293de