Merge "surfaceflinger: fix initial crop computation" into oc-dr1-dev