Merge "More work on device idle mode."