Merge "Fix jumping slider in split shade" into tm-qpr-dev