am d2a9194b: Merge "Refactoring dimens for cell size / gap" into jb-dev

* commit 'd2a9194b6119051962edab14cc26d12706867c72':
  Refactoring dimens for cell size / gap