Merge "Merge "Fix doFadingAnimationLocked in sanitized builds." am: 05284b6c6a am: b327eb682e am: f74c76e2df  -s ours"