Merge "Ignore the active network scorer when checking for idleness" into mnc-dev