Merge "Don't update user's setup state unless it changed" into lmp-dev