Merge "cec: Reset system audio mode status carefully [2/2]"