We use the keyring, so let's make sure it gets properly initialized for sessions in factory reset mode. (cherry picked from commit 4c92bf40) (cherry picked from commit a4fc3c88)
mentioned in commit 81060723