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