Merge "Fix website settings favicon loading."