Made activated picking tool more robust regarding to working data changes.
Merge branch 'bug-18205-MakePickingToolMoreRobust'