Merge "system_server: fix logging channel" into main