Merge "Make sure all debug logs could be present after enabled" into tm-dev