Merge commit 'a9efeb48ea6e74be217f27fb1373d7c2a3eb748b' * commit 'a9efeb48ea6e74be217f27fb1373d7c2a3eb748b': also expose onDrawHorizontalScrollBar() in View