Merge "Fix locking in DeviceIdleController."