Merge "Make DimLayer size dependent on stack layout." into klp-dev