Merge "don't hardcode "mSurface" throughout our source code" into kraken