Merge "Fix channel panel UI on 3 button nav devices" into udc-dev