Sort channels and groups by id

Test: manual
Change-Id: I3949e9eb7b901bd897d848627682878937aac0c1
1 file changed