Merge "Special case the suspend to runnable transition when locking."