Merge "Reduce idle, idle_after_inactive timeouts to 15m" into nyc-dev