Merge "Device idle fixes: issue #22209630 and issue #22225665" into mnc-dev