Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev