Merge "Fix CloseAllAppWithAppHeaderExit tests" into main