Merge "Remove clear all button in overview for contextual split" into main