Merge "Fix wrong split percentage after split layout been pushed up" into tm-dev