Merge "Fix crash when opening overflow menu whilst selection active" into main