Merge "fix(tc): retain NS timer frame ID for TC2 as 0" into integration