Merge "Add some unit tests for ViewUtils" into rvc-qpr-dev