Merge "Remove bubble from stack by key instead of icon" into rvc-dev