am 8ac896b8: Merge "Fix serious data loss issue for folders and hotseat items" into ub-now-mister-ugly

* commit '8ac896b8c84066c109c2c4b97805f36270636121':
  Fix serious data loss issue for folders and hotseat items