Merge "Fix progress dialog progress bar"