Merge pull request #18564 from chuck-lee/bug-997791_1.3t

Bug 997791 - Only set wifi.enabled when it is changed. r=arthurcc a=1.3T