am 9364986c: Merge "Add support for uri favorites and resolve groups" into ub-now-mister-ugly

* commit '9364986c83d275509229e5f24ff2b1a27c7842b7':
  Add support for uri favorites and resolve groups