Merge branch 'MDL-52371-Activity-Chooser-alignment-of-strings-that-need-line-wrap...