Merge "Fix wrong matcher for PackageSetting.keySetData"