Merge "Use caller's user id for recent caller info" into sc-dev