am e73a100f: am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken