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

* commit 'c5a764f68c26edd9de0590d4b1797856fed7d2a2':