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