Merge branch 'master' into 908-account-recovery-ability-to-add-contacts-to-trusted-contacts-list-for-account-recovery