Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev