[GAIA BUG969393] - Different device storage used
[GAIA BUG969393] - Get default storage volume using SettingsLock
[GAIA BUG969393] - Cleaning the repo from non working parts of the patch
Merge pull request #283 from michalbe/Bug969393-temp

[GAIA BUG969393] - Fixing SD Card contact import