Merge "Prevent apk-in-apex from being registered under wrong apex" into rvc-qpr-dev