Merge "Broaden some BQ owners to libgui" into main