Merge "Add confirm before delete/send and hide checkbox settings"