Merge "Apply hdmi control options to operation" into lmp-dev