Merge "fix looping with Gmail provider and auto mark-read. cleanup."