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