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

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