Merge "Fix suspend bugs" into jb-mr1-dev