am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev

* commit 'c004c9a87f0d4afa3a01f39922ad934def93c776':
  Fixes for ActivityView on home activity