Merge "Fix restoring of layer type"
am: 0b28b42

* commit '0b28b42c0f2d94777b517c7f270956240978e4dd':
  Fix restoring of layer type