Fixes #227168

Also moves some old Action registrations to Action2 and uses proper
menu registration for context menu display.