Merge "DimLayer: More release fixes." into qt-dev