Merge "Make the idle timer for network data tracking configurable" into main