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

* commit 'fd922200f9dbc91b406ff59d2d7be6ea8dcb2c0b':
  Don't confirm if discarding empty message