Merge pull request #2404 from sigmabeta/master Android: Scale number of columns in game grid according to screen width.