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