Merge "Updating QS state to default when going from or to split shade" into tm-dev