Merge "Move numAllAppsColumns to displayOptions" into sc-dev am: 06452a427d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13983965

Change-Id: I8e1f123f3c1df8f2cd6a1ec9fb0110ea29b49f02