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