Merge "Surface: Fix bad casts"