Merge "Fix split screen divider corners flicker" into tm-dev