am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev

* commit '799916e6ac706921e43a3382e5d9e06e13f87525':
  Revert "Check non-primary user dirs during package scan"