Merge "Fix null surface crash when switch split" into tm-qpr-dev