Merge "Remove inSplitScreen function" into tm-dev