Merge branch 'fix/notifsettings-breaking-login' into 'develop'