Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev