Merge "Fix issue #65298216: DeviceIdleController needs to watch..."