Merge "Fix delayed wifi shutdown" into jb-dev