Merge "Scrollbar handle from gingerbread Bug: 5076695"