Merge branch 'Bug-android-back-button-when-navigating-away-from-settings' into 'rebased-redesign'

Fix error occurring when navigating back from settings section

See merge request bloodyhealth/drip!319