Merge "Fix windowless snapshot surface drawing with mismatch configuration." into main