Merge "Updating some comments and variables" into ub-launcher3-rvc-qpr-dev