Re-order command registry to match toolbar order

Bonus: fix grammar in DialogAction comment.

Change-Id: I0fdf5f028f7191b0d662456ec1506490d7439a1a
Merge "Re-order command registry to match toolbar order"