Merge "Round split layout values instead of using int cast" into tm-qpr-dev