Merge "Make auto-suspend configurable" into main