Merge "Make sure we check read state when determining whether to use cached item or redraw." into jb-ub-mail