am d0a9379f: am 7a00dcaf: am e30714ae: am 0219dfc6: b/17045765. Retain folder sync window settings on migration.

* commit 'd0a9379fb8f839aff941ca226f7a10c1ae01f7a1':
  b/17045765. Retain folder sync window settings on migration.