Fix delete template warning message

Backported from CM Jellybean branch