Merge "Review of suspend/unsuspend APIs" into pi-dev