Tweak behaviour to match description in demos

When pressing save one time before and then delete, deletion should
still fail.

Also deletion is likely to be an async operation, thus its result
should be displayed delayed.

Change-Id: I60f42fbf8c11f98b3e9b342b206882db9eb3a8cf
Merge "Tweak behaviour to match description in demos"