Merge "Add a carrier config to specify validation timeout for data switch." into qt-qpr1-dev