Merge "Fix QSCarrierGroup click listeners" into tm-qpr-dev