Merge "Fix Buffer Overflow in Vendor Service display.qservice" into pi-dev