Merge "Relayout before creating surface" into oc-dev