Revert "Remove saving and loading (and client matching by) WM_COMMAND."
This reverts commit 2eac7634cc524bf5e425cf081a639a6b6407e380.
Cherry-picked from 5.6.
CCBUG: 362671