Merge "More dvr display test." into pi-dev