Merge "Enhance error handling logic to restore split-screen" into tm-qpr-dev