Merge "Update user cache when coming from isAppCloneUserPair()." into sc-dev