Merge "Fix getting app resource in split apks" into main