Merge "handle locale changes directly in Browser"