Merge "Allow two lines max for text view in system shortcuts." into sc-dev