Merge "Initial implementation of light-weight idle mode."