Merge "Stop using persistent store for tree collapse states." into main