Merge "surfaceflinger: fix layer count"