Merge "Fix fold/unfold clear all button in Overview stops working" into main