Merge "Don't mark wifi disabled unless it's off." into klp-dev