am 94355e03: am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1

* commit '94355e03e8388b3c7a263c0c9da12bac8c9914f1':
  Fixing small regressions in folder text offset. (Bug 5600902)