Merge "Patch for issue 2363606:  Make EAS sync window default 3 days."