Merge "Support runtime log toggling (1/n)"