Merge "PreDraw scrim on AOD -> UNLOCKED"