Merge "Reduce native heap usage of QSCarrier#updateState."