Merge "Fix Conversation page flickers when back" into tm-dev