Merge "Return inline presentations of credential entries" into main