am acd75301: am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev

* commit 'acd753010dcf6d8079e4620722921694cb041dbf':
  Show undo option for 3 seconds after the last picture is deleted.