Merge "Camera: fix previewCb come earlier than layout done" into oreo-cts-dev