Merge "Display W+ icon following carrier config" into sc-qpr1-dev