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

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