Merge "Fix NLS tests for no notification" into tm-dev