Merge "Merge "Fix doFadingAnimationLocked in sanitized builds." am: 05284b6c am: b327eb68 am: f74c76e2 -s ours"