Merge "Fix missing invocation of HdmiControlStatusListener" into sc-dev