Merge "Add null check for scancallback" into tm-dev