Merge "Make logd more aggressive when scanning for the position from which to resume logging." into pi-dev