Merge "Merge "Fix render thread early termination" into android15-tests-dev am: d1e7e80e82" into main