Merge "Update CEC device features constants and handling"