Merge "Improve the reliability of the SimpleSaveActivityTest" into rvc-dev