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

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