Merge "Move numAllAppsColumns to displayOptions" into sc-dev