[TASK] UpdateViewport

Change-Id: I0000000000000000000000000000160120130737