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

Change-Id: Iac648c69e352050d7aa84595b9a72c5defae8705