Merge "Do not allow focus on handle when menu is open" into main