Merge "Fix PackageInstaller displays with multi-user" into jb-mr1-dev