Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread