Merge "Change URI favorite resolving to use launch intents" into ub-now-porkchop