Merge "Decouple sleep and attentive timeout settings."