Merge "Clear identity when releasing display resources." into udc-dev