[automerger skipped] Merge "Make summary text update after settings changes" into pi-dev am: b915f3566b
am: bee0516dfe  -s ours

Change-Id: Ibadb731396a1665f736764a8f6dc22cbb5bd67a7