Merge "Handle non-visually-interruptive updates better in bubbles" into rvc-qpr-dev