Homescreen grid size: back to stock values

Change-Id: Ie675d76418b1a9140f26b3a6909703a20fc8bc06
Preferences: added option to restart launcher

Change-Id: I234c676ca1440d24c29a3cb087bbd0b7d5a57c7a