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

Change-Id: Id42ba94342d2d2692791a8867270acfd008a113c