Merge "Add support for round scroll bars to View.java" into nyc-mr1-dev