Merge "Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: ee3602595a" into oc-mr1-dev-plus-aosp