Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev