Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev