Merge "Ensuring that we don't try to use and propagate null activity labels." into mnc-dev