Merge "Make summary text update after settings changes" into pi-dev