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

Change-Id: I17d63173b63f39acf6bada648a15dc86b1000ce2