Merge "Fix favicon updating to handle redirects"