Merge "Reduce flaky of AppStoragePreferenceTest"