Merge "Move Trace Controlling to within Traceur app." into main