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

* commit '19d76bb7ca777fb59c96fb627a2fd9eacd76dd50':