Merge "Refresh subscription info when subid changes" into pi-dev