Merge "Make onVirtualDisplayRemoved callback idempotent." into udc-qpr-dev