Merge "Close guts/gear after a timeout and if there's been no interaction" into nyc-dev