Merge "Fix issue #27653326: Sync doesn't work in doze maintenance" into nyc-dev