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