Merge "Conversation view touch event shenanigans"