Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev