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

Change-Id: I39e32d9a85150174fafc79c8bc39310dc71bd069