Merge "Carrier config to switch data if primary is OOS" into qt-qpr1-dev