work on #2315: do not switch to internal storage

Switching to internal storage has the potential for destructing some
user data if the user reinserts an absent SD card and reswitches the
applicatioon to use it.
Merge branch 'release' into upstream