Merge "Fix Conversation page flickers" into tm-dev