Merge "[res] Load as little of ApkAssets as possible" into main