Merge "Fix in Modem Activity Info updates" into pi-dev