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

Change-Id: I40e4a9cb1e70f4cb380108e2db5117062f06f307