Merge "QS in split shade should listen to changes earlier" into tm-qpr-dev