Merge "Fix left margin too big on split shade" into tm-dev