Merge "Grant client app visibility with UID from activity record" into tm-dev