am ef29f6af: Merge change 4483 into donut

Merge commit 'ef29f6afb4746eae8263ab901a5d3677bc04574b'

* commit 'ef29f6afb4746eae8263ab901a5d3677bc04574b':
  Fixes #1414069. Display recent activities with two lines of text.