am edb555ed: am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev

* commit 'edb555edceaf51f7ef40e35257a4b00c06a68e72':
  Fix ActivityView layout bug.