Merge "Fix suspend settings at boot" into jb-mr1-dev