Merge "Catch SecurityException from NoMan to workaround possible race condition" into tm-dev