am 4a22568d: Merge "Forcing tabs to be single line and width bound (Bug 5646142)" into ics-mr1

* commit '4a22568d492361e5118b0a01b9c4ec52017adc31':
  Forcing tabs to be single line and width bound (Bug 5646142)