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