FAIMS-285: fixed broken restore activity
Merge branch 'master' of github.com:IntersectAustralia/faims-android into auto-recovery-fix