Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken