Merge "Fix channel screen launching" into pi-dev