am a9b9bad5: am 654fd89b: am 06df160b: am c5f51ad6: am 7909e6a7: Merge "Add optional vertical offset for folder chips" into ub-gmail-ur14-dev

* commit 'a9b9bad594203041684ebc58d11542635228f806':
  Add optional vertical offset for folder chips