Merge "diag: Make fixes to diag_switch_logging"