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

Change-Id: Ice04dac674346bcfbdadae8b3a70431c8290b8db