Merge "Use app id instead of uid" into main