Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev