Merge "Check if last resumed activity is null before resuming." into pi-dev