Merge "Set active port path to HdmiControlService" into lmp-dev