Merge "Fix lookup order when opening directly from APK"