Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev