Merge "Update HDCP for physical displays" into main