also consider changes in DRAFT state

Change-Id: I729dc9f37f604d7a7ed97ddb7395080b3afa3b3e
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>