Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
am: 572cb5242d

Change-Id: I7b79b055f7ffd9a62a741dfe98c71b9fa079b645