Merge "Fix doFadingAnimationLocked in sanitized builds."