[2.2] Prevent bulk edit cancel from clearing options.

Fixes #6344