Merge "Add ADAPTIVE_SLEEP setting"