am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev

* commit 'b2eed1d6e11f38c00ce1776ade14dfa004c6119f':
  TIF: Get or create the user state when failed to find existing one