[Misc] Better consistency between menus code in Flamingo.

(cherry picked from commit ab7ed3d2350975f9e730ece513f351a2f5c09779)