Merge "Fix AoD front scrim being opaque at DOZE_PULSING"