Merge "Use cached getPackageInfo for target overlayable" into rvc-dev