Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev