Merge "Fix AppInfoWithHeaderTest" into main