Merge "Remove unused qs_peek_height, redundant height method" into udc-qpr-dev