Merge "Fix off-center bubble pointer" into rvc-dev