Merge "Fix NPE in overview action buttons" into main