Merge "Calculate task height directly off portrait height" into ub-launcher3-master