Merge "Updated progress bar and scrubbers, adding xhdpi Bug: 5076695"