am 481b54be: am dc548483: Move activities from DisplayContent to TaskStack

* commit '481b54be1acb990bab3933b6248964e351bdcd99':
  Move activities from DisplayContent to TaskStack