Merge "Follow-up on bug #65298216: DeviceIdleController needs to..." into oc-mr1-dev