Merge "Relayout before creating surface" into oc-dev
am: b76845aa42

Change-Id: I8547943c9e67067b896797a6a45410a24b903b77