Merge "Move Snapshots to own DB on sdcard"