Merge "Fix ActivityView layout bug." into klp-modular-dev