Merge "hqd: virtual display code clean up"