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