Merge "Prevent sleep tokens from being created recursively." into rvc-qpr-dev