Merge "clean-up surfaceflinger a bit" into kraken