Merge "Allow setting doze timeouts based on system feature" into nyc-dev