Merge "fix wekelock issue" into jb-dev