Merge "Add setting to enable the eARC feature"