Merge "Fix dropdown more options bug" into main