Merge "Allow staging multiple sessions with non-overlapping packages (apk+apex)"