Merge "Fix surface offset issue when enter split from recents" into tm-qpr-dev