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