Bug 969525 - Wrong message displayed when exporting contacts with USBStorage enabled


- Rewrite updateStorage function for better readability
- Improve setting check to update always
- Fix l10n call
- Test added