Merge "Fix SMS and Calls preference summary displays empty." into main