Merge "Add getDisplayViewport for screenrecord tool" into pi-dev
am: 5ca4b905fe

Change-Id: I08cc0720fb0362cd5f4063ed8b3e6751cccf92fd