Merge "Add a missing NULL check for postActivityStartTokenRemoval()"