Merge "Add control to disable suspend optimizations" into jb-mr1-dev