Merge "Trace predictionExpired and dropped frames properly" into sc-dev