am 83a634a6: Merge "Don\'t confirm if discarding empty message" into ub-gmail-ur14-dev

* commit '83a634a6b80389a3e98dc72b2248cbfe3cee6961':
  Don't confirm if discarding empty message