Fix and unpend all specs which are currently failing with :combined_menu flag on

Issue to link MR !61831 (merged) with Epic &5645 (closed).

See the MR for details.

• Requirements (issue)
• Tasks (epic)
• Full Context Spike MR (permanent draft)
• All MR parts