Merge "Fix aliasing issue with bubble badge bitmap" into rvc-qpr-dev