Merge "Updated scrollbar handle Bug: 5076695"