Merge "Change order of ps and suspendmode calls" into jb-mr1-dev