am ee7c63da: Merge "Inconsistent state after emptying trash" into ub-gmail-ur12-dev

* commit 'ee7c63da505ccee3e391cf1baa2f64b7db78aaa9':
  Inconsistent state after emptying trash