Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983" into cw-e-dev