Merge "Add developer options for grid change for Styles Bug: 118758696" into ub-launcher3-qt-dev
am: 0d51988d6e

Change-Id: Iea6edce57f2a8493f89165b457e089c5aa48047c