Merge "Always close PreSimpleSaveActivity after PreSimpleSaveActivityTest tests." into pi-dev