Merge "Add new carrier config to record the default preference setting" into tm-qpr-dev