Merge "Check non-primary user dirs during package scan" into jb-mr1-dev