Merge "Use the original caller pid for computing visibility" into jb-mr1-dev