Merge "Make summary text update after settings changes"