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

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