Merge "Connecting to BufferQueue before setting surface." into oc-dev