Merge "Add support for preset ANW buffer mode" into oc-mr1-dev