Merge "Fix missing chip style in treeview"