Merge "Updated progressbar_indeterminate and scrollbar_handle Bug: 5076695"