Merge pull request #24404 from nullaus/bug1062136-v2.0

Merge pull request #24149 from nullaus/v2.1
(cherry picked from commit 5c2303ec4e367da060aa1b807d541a6549b3d72a)

Conflicts:
	apps/system/test/unit/action_menu_test.js