Merge "Do not call setReady(false) when finishing" into sc-v2-dev