Merge "Fix NPE from dismissing more options" into main