Merge "Remove a comment that a line of code is a workaround" into ub-launcher3-rvc-dev