Merge "Revert "Shrink surfaceflinger""