am 1f348428: Merge "Don\'t update user\'s setup state unless it changed" into lmp-dev

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