Merge "surfaceflinger: fix layer count" into oc-dev