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