Merge "Fix VR surface attributes not being read on surface create." into oc-mr1-dev am: 0249b61e4d
am: 1c762d8309

Change-Id: Idd09f2406e90477b8a19452db7a0505b87ecae3a