Merge "Use numAllAppsColumns to calculate height of all apps icons" into tm-dev