Merge "SF: Enable continuous transaction tracing on userdebug builds"