Merge "Fix render thread early termination" into android15-tests-dev