Merge "Fade scrims slower when entering AOD" into pi-dev