Merge "Fix restoring of layer type" into ub-launcher3-calgary
am: a0088a5

* commit 'a0088a51063f422ec31d1f095c3fcccdd0f2c15a':
  Fix restoring of layer type