Fix for the crash on exit for older Samsung models

I committed this to master by mistake, this was reverted and placed onto this branch for review.
This should be renamed to something like 'SamsungMapleUnloadTest', as it causing the build to fail due to a duplicate test name.