Merge "Ensure chip view updates on main thread"