am 73164dc7: Merge "Combine DimAnimator and DimSurface into DimLayer"

* commit '73164dc7bce52f6658eb2f786c45538e52404ab4':
  Combine DimAnimator and DimSurface into DimLayer