am 7909e6a7: Merge "Add optional vertical offset for folder chips" into ub-gmail-ur14-dev

* commit '7909e6a7d08dc02a6ea36f0b16cd153f1a648548':
  Add optional vertical offset for folder chips