Merge "Make UMO squishy in split shade" into tm-qpr-dev