Merge "Add strings for AP band UI changes" into pi-dev