Merge "Update extra space allocations for taller devices." into sc-dev