Merge "Fix issue when toggling profiling from visual to off to visual"