Merge "Defer surfaceflinger composition until data latch" into oc-dev am: 09e897b415
am: d9d704766f

Change-Id: I520d9107f8874612e7c32e115cbdf126f0508126