Merge "Scope package manager queries for ephemeral apps"