Merge "Apply contextStart consistently in getRunAdvance" into mnc-dev