Merge commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1' * commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1': Make SharedPreferencesBackupHelper wait for async SharedPreference writes
Merge commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1' * commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1': Make SharedPreferencesBackupHelper wait for async SharedPreference writes