Merge "Add Setting for HDMI CEC 2.0"