Merge "Fix potential strict mode violation when stopping RTT." into sc-dev