Fix some more empty bubble issues!

The main thing here is not ignoring new selected bubbles that are different instances, but otherwise equal (same key, etc.).

Also, release the animating-out surface on collapse, and don't start the switch animation if we're collapsed. I was able to cause some issues in my testing with animating-out surfaces lying around.

Bug: 159861400
Test: manual, also using modded bubble test app with instantly canceled+readded bubbles
Change-Id: Ic19ee0bd3f4700021b1c790ae267beba9a52c532
2 files changed