Merge "32394618, 36899165, 37245921 Fix unread and text_only flags"