Merge "Add metadata in direct display surface to support ANativeWindow use cases." into oc-mr1-dev