Merge "Fix installing applications from non-primary users." into jb-mr1-dev