Bug 941727 - Fix up test_unlock_to_camera
Merge pull request #13950 from AndreiH/bug941727

Bug 941727 - Fix up test_unlock_to_camera