Merge "Use appId instead of uid" into sc-dev