Merge "Use inclusive language in PaintBooth" into rvc-qpr-dev