This commit also includes code to include channel_folders data in register response. Fixes part of #31972.