Merge "Check whether AnimationDrawable is one shot only when visibility changes"