Merge pull request #12635 from gasolin/issue-921327

Bug 921327 - [Flatfish][homescreen] show 6 icons in a row on tablet, r=crdlc
(cherry picked from commit 128c8a9a8a3499ddbc9ef3cd94e4687a076f06ba)