Merge "Fixed ProgressBar logic for AnimationDrawables"