Merge "Disable double-click toggle for flattened tree." into main