Merge "HDMI: Fix possible IndexOutOfBoundsException in HdmiControlService" into main