Merge "Fix PreSimpleSaveActivityTest" into rvc-dev