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

Change-Id: Iee7c4a40a545eefeeac0729a825e208fb03eb1b0