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

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