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

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