Merge "Sort Uncategorized channel to the bottom." into pi-dev am: 97f63ba910
am: 3aaf3bcc52

Change-Id: Ibd106a3ce049eb90263f69878088b91e3e8dc359