Merge "Use renameTo safely when creating the user 0 account database"