Merge "Defer surfaceflinger composition until data latch" into oc-dev