Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev