Merge "Handle the WatchRotation failed" into rvc-dev