Merge "Fixing indeterminate progress bar animation state."