Merge "Enforce updates in main thread in QSCarrierGroup"