Merge "Update stashed handle region to only include the handle" into sc-v2-dev