Handle localStorage quota exceeded errors gracefully
Merge branch 'dev'