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

* commit '379e73435ff1ed5c0fd3dabd6ae2d50174085d22':
  DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983