Merge changes I129b5a7f,I633f293e

* changes:
  Allow screen capture for a specified uid.
  Store Layer ownerUid based on metadata or callingUid.