Merge "Pass real calling uid to metrics logger if available" into sc-dev