Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev