Merge "Allow for the possibility of null ActivityContainer" into klp-modular-dev