Revert "Revert "Bug 940647 - Move bookmark creation to operator variant app""

This reverts commit 2893542864856b672c05d0e6ed72b289e06cf306.
Bug 940647 - Fix format of data in unit test
Merge pull request #23526 from qdot/fix-940647

Fix 940647