Fix: crash when local storage is full
Merge branch 'develop' of github.com:mrfesol/android into develop