Merge "Bubbles: fix some issues with the pointer" into sc-dev am: 16529a26

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14359193

Change-Id: I4642b108f2b99d6d6a0c84b3170d7f4a2e0f46db