Merge "Fix cut off actions in messaging style" into nyc-dev