Merge "[Attempt #2] Consider UID instead of PID in canBeObscuredBy()"