Merge "Fix reference counting of wifi locks" into jb-dev