Merge "Fix Hdmi Control service"