am 3d57f657: am c5a764f6: am 266a91db: Merge "Change URI favorite resolving to use launch intents" into ub-now-porkchop

* commit '3d57f657e682d634ff0c089ce36efe6d82b9de49':