Merge "Do not finish early if caller is SUW" into rvc-dev