* commit '96ada57b2c0c456e9d3a1f43e3ff691f14ec1459': Allow for the possibility of null ActivityContainer