Merge commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6' * commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6': Periodically scan wifi when wifi is not connected and wifi lock is
Merge commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6' * commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6': Periodically scan wifi when wifi is not connected and wifi lock is