Merge "Fix sketchy bubble preference button" into rvc-qpr-dev