Merge "Do not animate scrim when ColorFade" into pi-dev