* commit 'fdeddad86776664f0070057749411e479522681d': Ensuring that we don't try to use and propagate null activity labels.