Merge "Sleep softly on device close." into tm-qpr-dev