Merge "Add getDisplayViewport for screenrecord tool" into pi-dev