* commit 'f4b195c9791b6112beb86119a5dd8ab7c55a5201': Don't update user's setup state unless it changed