Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1