Merge "Use correct bounds for scroll bar rendering." into nyc-mr1-dev