Merge "hal: mpq:  configure HDMI channel number"