Merge "Use libsuspend to trigger suspend" into jb-dev