fix settings file could be left opened in rare circumstances
Merge branch 'cm-10.2' of github.com:PhilZ-cwm6/philz_touch_cwm6 into cm-10.2

Merge changes from upstream