Merge "Always parse sharedUserId and sharedUserLabel" into tm-dev