Merge "Fix issue #26879170: Adjust doze maintenance windows..." into nyc-dev