Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev