Merge "Check for null when calling getCreatedActivity which is marked as Nullable" into tm-qpr-dev