Merge "Custom SmartReplyView layout"