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

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