Merge pull request #12607 from gasolin/issue-921404

Bug 921404 - [Flatfish][Lockscreen] screen clock is too small on tablet, r=timdream
Bug 921327 - [Flatfish][homescreen] show 6 icons in a row on tablet