Merge "Bug fix for device idle mode light"