Merge "Add ability to separately disable light and deep idle." into nyc-dev