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