Fix button anable/disable logic with HCE in 10.3