Merge "Remove bubble from stack by key instead of icon" into rvc-dev am: 31c6d87f am: 3b29091d am: b00eead0 Change-Id: I56149a808b7c0741d1cd183455d75a78676df8ed